Click to go back button to show MacroGroup list from Group page within ChangeMapMenu.vue
#579
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… initCongif.group.macrogroup_id attribute
volterra79
added a commit
to g3w-suite/g3w-admin
that referenced
this pull request
Feb 19, 2024
Raruto
added
ux
Raruto
changed the title
ChangeMapMenu.vue
…lient into g3w-admin/pr/761 # Conflicts: # src/components/ChangeMapMenu.vue
…one macro groups: Improving
volterra79
added a commit
to g3w-suite/g3w-admin
that referenced
this pull request
Feb 23, 2024
|
@volterra79 It doesn't seem right: 1. Open change map menu
2. After click on "Back arrow"
|
|
@wlorenzetti should we backport this up to [email protected]? |
Raruto
approved these changes
Feb 26, 2024
github-actions bot
pushed a commit
that referenced
this pull request
Feb 26, 2024
…n `ChangeMapMenu.vue` (#579) * add cache * Temp dev * Check if current project (initiial) belong to a macrogroup/s checking initCongif.group.macrogroup_id attribute * avoid nested conditions * replace `this._cache` with internal functions `get_macro(id)` + `get_group(id)` * missing `cb` * Show macrogroups list if a project initial group belong to more than one macro groups * Show macrogroups list if a project initial group belong to more than one macro groups: Improving * Show macrogroups if init project belong to a group inside more than one macrogroups * remove padding * Revert "remove padding" This reverts commit 540c938. * code clean up * Fix case of group.id == macrogroup.id * remove `setFallBackImage` and `macrogroupsandgroups ` * remove `isChildNode` and `_onChangeRoot` * jsdoc * Fix .on register event. Need to be a function --------- Co-authored-by: Raruto <[email protected]> (cherry picked from commit ebb57cd)
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-v3.8.x v3.8.x
# Navigate to the new working tree
cd .worktrees/backport-v3.8.x
# Create a new branch
git switch --create backport-579-to-v3.8.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ebb57cdffbf6f92b6c6acb75be269919383d7d57
# Push it to GitHub
git push --set-upstream origin backport-579-to-v3.8.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v3.8.xThen, create a pull request where the |
volterra79
added a commit
that referenced
this pull request
Feb 26, 2024
…n `ChangeMapMenu.vue` (#579) (#585) * add cache * Temp dev * Check if current project (initiial) belong to a macrogroup/s checking initCongif.group.macrogroup_id attribute * avoid nested conditions * replace `this._cache` with internal functions `get_macro(id)` + `get_group(id)` * missing `cb` * Show macrogroups list if a project initial group belong to more than one macro groups * Show macrogroups list if a project initial group belong to more than one macro groups: Improving * Show macrogroups if init project belong to a group inside more than one macrogroups * remove padding * Revert "remove padding" This reverts commit 540c938. * code clean up * Fix case of group.id == macrogroup.id * remove `setFallBackImage` and `macrogroupsandgroups ` * remove `isChildNode` and `_onChangeRoot` * jsdoc * Fix .on register event. Need to be a function --------- Co-authored-by: Raruto <[email protected]> (cherry picked from commit ebb57cd) Co-authored-by: Francesco Boccacci <[email protected]>
Merged
volterra79
added a commit
that referenced
this pull request
Mar 1, 2024
…oup page within ChangeMapMenu.vue
wlorenzetti
added a commit
to g3w-suite/g3w-admin
that referenced
this pull request
Mar 4, 2024
* Add `macrogroup_id` to group serializer. * 🐛 Client g3w-suite/g3w-client#579 * ✨ Client g3w-suite/g3w-client#579 * ✨ Client g3w-suite/g3w-client@ebb57cd * Typo: fix 'nomacrogroup' filter. * Typo. * Fix testing. * 🐛 Client g3w-suite/g3w-client#590 --------- Co-authored-by: wlorenzetti <[email protected]> Co-authored-by: volterra79 <[email protected]> Co-authored-by: Raruto <[email protected]>
wlorenzetti
added a commit
to g3w-suite/g3w-admin
that referenced
this pull request
Mar 4, 2024
* Add `macrogroup_id` to group serializer. * 🐛 Client g3w-suite/g3w-client#579 * ✨ Client g3w-suite/g3w-client#579 * ✨ Client g3w-suite/g3w-client@ebb57cd * Typo: fix 'nomacrogroup' filter. * Typo. * Fix testing. * 🐛 Client g3w-suite/g3w-client#590 --------- Co-authored-by: wlorenzetti <[email protected]> Co-authored-by: volterra79 <[email protected]> Co-authored-by: Raruto <[email protected]> (cherry picked from commit ee5486e)
wlorenzetti
added a commit
to g3w-suite/g3w-admin
that referenced
this pull request
Mar 4, 2024
* Add `macrogroup_id` to group serializer. * 🐛 Client g3w-suite/g3w-client#579 * ✨ Client g3w-suite/g3w-client#579 * ✨ Client g3w-suite/g3w-client@ebb57cd * Typo: fix 'nomacrogroup' filter. * Typo. * Fix testing. * 🐛 Client g3w-suite/g3w-client#590 --------- Co-authored-by: wlorenzetti <[email protected]> Co-authored-by: volterra79 <[email protected]> Co-authored-by: Raruto <[email protected]> (cherry picked from commit ee5486e)
volterra79
added a commit
that referenced
this pull request
Mar 4, 2024
wlorenzetti
added a commit
to g3w-suite/g3w-admin
that referenced
this pull request
Mar 4, 2024
* Add `macrogroup_id` to group serializer. (#761) * Add `macrogroup_id` to group serializer. * 🐛 Client g3w-suite/g3w-client#579 * ✨ Client g3w-suite/g3w-client#579 * ✨ Client g3w-suite/g3w-client@ebb57cd * Typo: fix 'nomacrogroup' filter. * Typo. * Fix testing. * 🐛 Client g3w-suite/g3w-client#590 --------- Co-authored-by: wlorenzetti <[email protected]> Co-authored-by: volterra79 <[email protected]> Co-authored-by: Raruto <[email protected]> (cherry picked from commit ee5486e) * ⬆️ Client ⬆️ Bump g3w-client v3.9.4 and g3w-client-plugin-qplotly v3.7.1 - https://github.com/g3w-suite/g3w-client/releases/tag/v3.9.4 - https://github.com/g3w-suite/g3w-client-plugin-qplotly/releases/tag/v3.7.1 * Fix for QGIS server >= 3.28 --------- Co-authored-by: volterra79 <[email protected]> Co-authored-by: wlorenzetti <[email protected]>
wlorenzetti
added a commit
to g3w-suite/g3w-admin
that referenced
this pull request
Mar 4, 2024
* Add `macrogroup_id` to group serializer. (#761) * Add `macrogroup_id` to group serializer. * 🐛 Client g3w-suite/g3w-client#579 * ✨ Client g3w-suite/g3w-client#579 * ✨ Client g3w-suite/g3w-client@ebb57cd * Typo: fix 'nomacrogroup' filter. * Typo. * Fix testing. * 🐛 Client g3w-suite/g3w-client#590 --------- Co-authored-by: wlorenzetti <[email protected]> Co-authored-by: volterra79 <[email protected]> Co-authored-by: Raruto <[email protected]> (cherry picked from commit ee5486e) * For QGIS server version >= 3.28 * Fix merge. * ⬆️ Client ⬆️ Bump g3w-client v3.8.17 https://github.com/g3w-suite/g3w-client/releases/tag/v3.8.17 --------- Co-authored-by: wlorenzetti <[email protected]> Co-authored-by: volterra79 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Depends on: g3w-suite/g3w-admin#761
Changes: "click to go back behavior"
Before: "goes straight back to the root"
After: "show macro group content" and then "go back to root""